From d2e3b493ab6a07e0ca1c523b859158f076673fd9 Mon Sep 17 00:00:00 2001 From: "emellor@leeni.uk.xensource.com" Date: Sun, 30 Oct 2005 13:45:06 +0100 Subject: [PATCH] Don't use XendRoot.get_vif_bridge to provide a default bridge -- instead, pass no bridge parameter and let the vif-bridge script find one for itself. Signed-off-by: Ewan Mellor --- tools/python/xen/xend/server/netif.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/python/xen/xend/server/netif.py b/tools/python/xen/xend/server/netif.py index 6041e5ed46..d6f7671a6e 100644 --- a/tools/python/xen/xend/server/netif.py +++ b/tools/python/xen/xend/server/netif.py @@ -51,22 +51,22 @@ class NetifController(DevController): script = os.path.join(xroot.network_script_dir, sxp.child_value(config, 'script', xroot.get_vif_script())) - bridge = sxp.child_value(config, 'bridge', - xroot.get_vif_bridge()) - mac = sxp.child_value(config, 'mac') + bridge = sxp.child_value(config, 'bridge') + mac = sxp.child_value(config, 'mac') ipaddr = _get_config_ipaddr(config) devid = self.allocateDeviceID() back = { 'script' : script, - 'mac' : mac, - 'bridge' : bridge, + 'mac' : mac, 'handle' : "%i" % devid } if ipaddr: back['ip'] = ' '.join(ipaddr) + if bridge: + back['bridge'] = bridge front = { 'handle' : "%i" % devid, - 'mac' : mac } + 'mac' : mac } return (devid, back, front) -- 2.30.2